Math 1117

Nb candidate patch 51843
Nb patch 22132